From: tsteven4 <tsteven4@users.noreply.github.com>
Date: Fri, 28 Dec 2018 16:16:41 +0000 (-0700)
Subject: clazy cleanup for gui (#289)
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~8^2~55
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22Program/%22http:/www.example.com/cgi/%22https:/%22Program?a=commitdiff_plain;h=08a86fc5e58e1ab1f65f7439b01aff82f204695a;p=gpsbabel.git

clazy cleanup for gui (#289)
---

diff --git a/gui/mainwindow.cc b/gui/mainwindow.cc
index a21ad9591..e634a8a27 100644
--- a/gui/mainwindow.cc
+++ b/gui/mainwindow.cc
@@ -298,7 +298,6 @@ void MainWindow::loadLanguage(const QString& rLanguage)
     currLang_ = rLanguage;
     QLocale locale = QLocale(currLang_);
     QLocale::setDefault(locale);
-    QString languageName = QLocale::languageToString(locale.language());
 
     switchTranslator(translator_, QString("gpsbabelfe_%1.qm").arg(rLanguage));
     switchTranslator(translatorCore_, QString("gpsbabel__%1.qm").arg(rLanguage));
@@ -648,10 +647,10 @@ void MainWindow::setIndicatorLights(QLabel *label, const QString &type, int code
       s = tr("Input and output formats do not support %1").arg(type);
       break;
     case 1:
-      s = tr("Input does not support %1; output format supports %2").arg(type).arg(type);
+      s = tr("Input does not support %1; output format supports %1").arg(type);
       break;
     case 2:
-      s = tr("Input format supports %1; output format does not support %2").arg(type).arg(type);
+      s = tr("Input format supports %1; output format does not support %1").arg(type);
       break;
     case 3:
       s = tr("Both input and output formats support %1").arg(type);
diff --git a/gui/map.cc b/gui/map.cc
index a4fe2a262..cb9270cd9 100644
--- a/gui/map.cc
+++ b/gui/map.cc
@@ -199,8 +199,7 @@ void Map::showGpxData()
       << QString("waypts[%1] = new google.maps.Marker({map: map, position: %2, "
 		 "title: \"%3\", icon: blueIcon});")
       .arg(num)
-      .arg(fmtLatLng(pt.getLocation()))
-      .arg(stripDoubleQuotes(pt.getName()));
+      .arg(fmtLatLng(pt.getLocation()), stripDoubleQuotes(pt.getName()));
     num++;
   }
 
@@ -232,7 +231,7 @@ void Map::showGpxData()
                  "    new google.maps.LatLng(%4),\n"
                  "    \"%5\",\n"
                  "    new MarkerHandler(1, %1)\n);"
-                ).arg(num).arg(path).arg(fmtLatLng(pts.front())).arg(fmtLatLng(pts.back())).arg(stripDoubleQuotes(trk.getName()))
+                ).arg(num).arg(path, fmtLatLng(pts.front()), fmtLatLng(pts.back()), stripDoubleQuotes(trk.getName()))
       << QString("bounds.union(trks[%1].getBounds());").arg(num)
       ;
     num++;
@@ -260,7 +259,7 @@ void Map::showGpxData()
                  "    new google.maps.LatLng(%4),\n"
                  "    \"%5\",\n"
                  "    new MarkerHandler(2, %1)\n);"
-                ).arg(num).arg(path).arg(fmtLatLng(pts.front())).arg(fmtLatLng(pts.back())).arg(stripDoubleQuotes(rte.getName()))
+                ).arg(num).arg(path, fmtLatLng(pts.front()), fmtLatLng(pts.back()), stripDoubleQuotes(rte.getName()))
       << QString("bounds.union(rtes[%1].getBounds());").arg(num)
       ;
     num++;
diff --git a/gui/upgrade.cc b/gui/upgrade.cc
index 56ae53276..0e82d8a47 100644
--- a/gui/upgrade.cc
+++ b/gui/upgrade.cc
@@ -271,8 +271,7 @@ void UpgradeCheck::httpRequestFinished(QNetworkReply* reply)
       response = tr("A new version of GPSBabel is available.<br />"
         "Your version is %1 <br />"
         "The latest version is %2")
-          .arg(currentVersion_)
-          .arg(updateVersion);
+          .arg(currentVersion_, updateVersion);
       break;
     }
   }
diff --git a/gui/version_mismatch.ui b/gui/version_mismatch.ui
index 880aefdf7..d285bdedc 100644
--- a/gui/version_mismatch.ui
+++ b/gui/version_mismatch.ui
@@ -51,7 +51,7 @@
      <item>
       <widget class="QLabel" name="ClVersion">
        <property name="toolTip">
-        <string notr="true" extracomment="Will be replaced by a versio nnumber at runtime.  Do not translate."/>
+        <string notr="true" extracomment="Will be replaced by a version number at runtime.  Do not translate."/>
        </property>
        <property name="text">
         <string/>